Selective Merge 2024-11-04 #326
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Description Fixes issue [reported in the discord.](https://discord.com/channels/1218698320155906090/1218698321053356060/1298139147428696095) --- # Media  --- # Changelog :cl: - fix: Cybereyes examine message no longer reveals person's identity. Signed-off-by: Remuchi <[email protected]>
# Description Ports DeltaV-Station/Delta-v#1383 with all due changes. Also moves some files from delta-v/nyano namespaces to the root namespace. # TODO - [X] Port fun - [X] Test fun - [X] Record fun <details><summary><h1>Media</h1></summary> <p> I had to compress the shit out of this video, so it's about as good as it can get. https://github.com/user-attachments/assets/3ab9d328-ae6e-4a6c-8a48-9da22783579a </p> </details> --- # Changelog :cl: - add: Raising glimmer too high can now cause glimmer wisps to start haunting the station. --------- Co-authored-by: deltanedas <[email protected]>
…(#1137) # Description Resolves #1132. # Changelog :cl: - fix: Fixed the "high amplification" trait lowering your amplification instead of increasing it. Signed-off-by: Mnemotechnican <[email protected]>
This cherry-picks space-wizards/space-station-14#30576 # Description adds cool energy bolas --------- Signed-off-by: Ghost581 <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: Remuchi <[email protected]>
# Description It was missing from the #944 for some reasons. # Changelog :cl: - fix: Added missing deflect alert locale. Signed-off-by: Remuchi <[email protected]>
* Fix (hopefully) * Fixed Spelling Mistake and minor Code Cleanup * Revert "Fixed Spelling Mistake and minor Code Cleanup" due to Pull Request Guidelines This reverts commit cee3e0226b349187bd8fd8b639e161fb877e8bdb. # Description Fixes SS14-Classic/deep-station-14#87 --------- Co-authored-by: DakotaGay <[email protected]> Co-authored-by: Julian Giebel <[email protected]>
# Description Behold, the counterpart to Shadeskip. Pyrokinetic Flare. It is the "Lessermost" of all planned Pyroclastic-Anomaly Powers. This one is quite simple. It produces a flashbang effect when cast, and creates some glimmer. This is a natural counter to people spamming Shadeskip all over the station, since flash effects can be used to clear living shadows. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/6db1db99-3985-4b6e-9766-b161394f0eee </p> </details> # Changelog :cl: - add: Added Pyrokinetic Flare as a new Psi ability.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Updated the penlight to work with the new UI system. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Fix Penlights --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Fixed penlights
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> this PR fix #1126 --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>        </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: #1126
# Description The listening post being able to recall the shuttle was a little too much for people, but luckily it and a few other things are datafields. This PR removes the "Shuttle Recall" functionality for the communications console on the Listening Post, while also giving a custom broadcast announcement to the comms console so that it isn't just using the Nuclear Operative Announcement. This way the listening post isn't forcing people to call red alert by faking a nukie threat every round. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - tweak: The Syndicate Listening Post now has a custom communications console, which no longer can recall Nanotrasen shuttles, and doesn't sign its messages as Nuclear Operatives.
# Description Some of the icons consist of multiple layers so they were incorrectly displayed in radial selector menus. Now this system uses the same method PrototypeSelectorMenu uses.  --- # Changelog :cl: - fix: Layered icons are now properly displayed in radial menus. Signed-off-by: Remuchi <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description I don't understand why it hasn't been done before tbf. https://github.com/user-attachments/assets/6ea2a3eb-80ce-4905-b546-7b8902308533 --- # Changelog :cl: - add: Clicking on health alert now will print message in chat, displaying your health state. --------- Signed-off-by: Remuchi <[email protected]>
# Description Made by request from Nuclear14, while also adding a trait that was present both in Parkstation, as well as something N14 would like to have. This PR extends the TraitSystem so that it can now also add or remove Factions from a character. It also adds in the Animal Friend trait from Parkstation/Fallout: New Vegas. # Changelog :cl: - add: The Animal Friend trait has been added to the game. Characters with this trait are not attacked by animals. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description Introduces a telescopic baton - a new self-defense weapon for command staff DEVELOPERS: * Adds a way to apply status effects with pre-made component. AWAITING DISCUSSION: * Currently, the system works that players are rewarded for their skill and ability to click precisely. The batton will knockdown someone only in first 1.5 seconds after extending it. If you fail to do so, you'll have to retract it and extend once again, which takes about 4 seconds total. --- <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/cc19bf44-391e-4d27-9be9-96d3d77bebc8 </p> </details> --- # Changelog :cl: - add: Added telescopic baton - a self-defense weapon for Command staff. --------- Signed-off-by: Remuchi <[email protected]> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>
# Description This PR Implements a new dedicated "Psionic Familiar System", allowing a new class of powers for summoning Familiars directly. Familiars are Psionic entities called from other planes of existence, who will follow and protect the caster, with their life if necessary. Familiars can never hurt their summoner, and inherit all of the faction tags of their summoner. When the summoner dies or is mindbroken, his Familiars are "sent back from whence they came". Notably, Psionic Familiars are not like Remilia or the Ifrit, they do not **depend** on being player controlled ghostroles, although they can be! If not player controlled, they instead function as an NPC, similarly to a Rat King's Servants. # TODO - [X] Implement new familiars for this system to use - [X] Get sprites ready for the summon familiar spells. - [x] Move Remilia and the Ifrit out of their Bible, and into the new Psionic Familiar System. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/8e89021b-3529-4b48-9909-7e8bfd72d587  </p> </details> # Changelog :cl: - add: A new class of Psionic powers has been added, "Summon Familiar". Familiars are a new kind of Psionic creature that can be summoned by Psions with the right power. Familiars will automatically follow their Master, attack anyone who attacks their Master, fight back when attacked, and attack anyone their Master attacks. Additionally, Familiars are also ghostroles, so that they can be taken over by a player, but otherwise do not require player control to function. Familiars disappear when they die, and will also disappear if their Master is either killed, or mindbroken. Psions can have a maximum of one(1) familiar at a time. - add: New psi-power "Summon Imp", as the first new Psi Familiar. Imps are small motes of living flame that follow and protect their summoner. Imps also emit an incredibly bright light, and can natively cast Pyrokinetic Flare. - add: Remilia has been updated to be a Psi Familiar, and no longer requires the Bible to summon. Chaplains now start with a Power that lets them summon Remilia once every 2 minutes. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: Remuchi <[email protected]>
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>
|
I think I submitted the PR to the wrong branch |
|
There we go, fixed |
|
The 1135 shows energy bolas, does it include telescopic batons as well? |
Oops, I mixed them up, let me fix- Also, I'll have to look into what makes the tests fail, when github finally lets me do so because right now I cannot load the logs. |
…igrations.yml -- Combine All Into eeMigration.yml (#1123) title # why? because there's no need to have four different files; when it can all be combined into an eeMigrations.yml; given there is no active PRs coming in from Frontier or Delta and they are not downstreams. my main issue was with the two eeMigrations files though # why is migration.yml left behind? keeps Wizden migration in tact to prevent CBT later down the line when Death does a wizmerge; plus no one checks the files anyways so there could be disasterous consequences from merge conflicts
# Description CommunicationConsoleComponent.CanShuttle claims its supposed to prevent a given console from Calling OR Recalling the shuttle, but instead it only prevents CALLING the shuttle, but not RECALLING it. This fixes that. # Changelog :cl: - fix: Communications Consoles that are marked as "Can't Recall The Shuttle" now can't recall the shuttle. Previously they were still able to recall it.
|
No master was the right branch, we went back to the old system and instead are using a stable branch. |
# Description Includes these PRs: space-wizards/space-station-14#27443 space-wizards/space-station-14#27232 space-wizards/space-station-14#28610 space-wizards/space-station-14#28134 space-wizards/space-station-14#27999 --------- Co-authored-by: eoineoineoin <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: plykiya <[email protected]>
|
Where my merge upstream button, anywho please update this PR with the latest "Master" branch as there was some fixes for build/test. |
That is a lie made up by the government drones
…ngines into floof/selective-merge-2024-11-04
…e-merge-2024-11-04' into floof/selective-merge-2024-11-04
|
I did merge the latest changes, including the update to RT227.0.0. It compiles, but there are now some linter errors caused by duplicate FTL locales. I'd fix them, but I am currently experiencing certain technical difficulties. NuGet refusing to work, git submodules being fucky, and more... I've already spent two hours trying to fix all of this; I'll try a different approach later and fix the errors if it succeeds later. |
|
Going over this, can you remove the Security Loadout Merge #1158? |
I'll comment the new loadouts out instead, because that PR includes both new prototypes (which could potentially be balanced for sec specifically), and changes to existing weapon loadouts. |
Memeji
approved these changes
Nov 10, 2024
|
I do ask you not to merge this until I and someone else get to test this PR. It's only today that I finally managed to resolve my issues with dotnet and managed to compile ss14 once again. |
Heard, we'll make sure not to merge it. Let us know when it's tested! |
|
doing a bunch of tests and it seems the gas analyser doesn't work |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I was told by trystan it'd fine to do a selective upstream merge, so here we go.
Note: any of those changes can be reverted on demand. Hail git.
This includes the following new features:
More Sec Loadout Guns (#1158)(new loadouts commented out, restyle of the existing loadouts preserved)This also includes a lot of fixes, some of which may or may not have been cherry-picked already, namely:
This does NOT include:
TODO
Changelog
🆑